From: Ray Strode <rstrode@redhat.com>
Date: Sun, 28 Jul 2013 19:55:09 +0000 (-0400)
Subject: loginDialog: don't ever call _reset directly
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3835
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=925eaa1db066d50dfd47aba95e22007abfea83f3;p=gnome-shell.git

loginDialog: don't ever call _reset directly

The only time we ever call _reset directly is when
detecting changes to disable-user-list.  We can implicitly
trigger a reset for this case, just as easily by calling
this._authPrompt.reset()

This commit makes that change for consistency and to make
it easier to adjust the authprompt workflow later.

https://bugzilla.gnome.org/show_bug.cgi?id=683437
---

diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index 1651af94f..40a4799db 100644
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -451,7 +451,7 @@ const LoginDialog = new Lang.Class({
 
         this._authPrompt = new AuthPrompt.AuthPrompt(gdmClient, AuthPrompt.AuthPromptMode.UNLOCK_OR_LOG_IN);
         this._authPrompt.connect('prompted', Lang.bind(this, this._onPrompted));
-        this._authPrompt.connect('reset', Lang.bind(this, this._reset));
+        this._authPrompt.connect('reset', Lang.bind(this, this._onReset));
         this._authPrompt.hide();
 
         this._authPrompt.actor.add_constraint(new Clutter.AlignConstraint({ source: this.actor,
@@ -530,7 +530,7 @@ const LoginDialog = new Lang.Class({
             this._disableUserList = disableUserList;
 
             if (!this._authPrompt.verifyingUser)
-                this._reset();
+                this._authPrompt.reset();
         }
     },
 
@@ -575,10 +575,7 @@ const LoginDialog = new Lang.Class({
         this._showPrompt();
     },
 
-    _reset: function() {
-        if (this._authPrompt.verifyingUser)
-            return;
-
+    _onReset: function() {
         this._sessionMenuButton.updateSensitivity(true);
 
         this._user = null;